From c615bf880936c2a6d69c311872b7614ec1c48e78 Mon Sep 17 00:00:00 2001
From: Robert Lipe <robertlipe@gpsbabel.org>
Date: Mon, 9 Dec 2019 09:55:43 -0600
Subject: [PATCH] Add util.h to various build files.

---
 CMakeLists.txt | 1 +
 Makefile.in    | 4 ++--
 cet_util.cc    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd0951740..9b47269f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,7 @@ set(HEADERS
   session.h
   shapelib/shapefil.h
   strptime.h
+  units.h
   xcsv.h
   xmlgeneric.h
   zlib/crc32.h
diff --git a/Makefile.in b/Makefile.in
index fa7828dec..7b33e2a7d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -778,7 +778,7 @@ jtr.o: jtr.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \
 kml.o: kml.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \
   gbfile.h session.h src/core/datetime.h src/core/optional.h grtcirc.h \
   src/core/file.h src/core/xmlstreamwriter.h src/core/xmltag.h \
-  xmlgeneric.h
+  units.h xmlgeneric.h
 lmx.o: lmx.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \
   gbfile.h session.h src/core/datetime.h src/core/optional.h \
   xmlgeneric.h
@@ -980,7 +980,7 @@ unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \
   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h \
   src/core/logging.h src/core/textstream.h src/core/file.h
 units.o: units.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \
-  inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+  inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h units.h
 util.o: util.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \
   gbfile.h session.h src/core/datetime.h src/core/optional.h \
   src/core/xmltag.h
diff --git a/cet_util.cc b/cet_util.cc
index 0e6970e7f..6b5666b9d 100644
--- a/cet_util.cc
+++ b/cet_util.cc
@@ -83,7 +83,7 @@ static signed int
 cet_cs_alias_qsort_cb(const void* a, const void* b)
 {
   const auto* va = (const cet_cs_alias_t*) a;
-  const cet_cs_alias_t* vb = (const cet_cs_alias_t*) b;
+  const auto* vb = (const cet_cs_alias_t*) b;
   return case_ignore_strcmp(va->name, vb->name);
 }
 
-- 
2.30.2